Changes for version 0.2 - 2011-06-15