final changes for v0.1
Merge remote-tracking branch 'origin/master'