fixed some format errors
bumped version to 0.6.1
Merge branch 'hotfix/0.6.1'