Merge branch 'release-0.6' into develop
hotfix to avoid server internal error
Bumped version number to 0.6.01
merge conflicts resolved