added 0.2 changes to master