updated for version 0.6.0
Merge remote-tracking branch 'origin/master'