code migration to 0.6
Merge remote-tracking branch 'daniel/master'