Preparation for version 0.6.0
Merge branch 'master' into issue_1
Version 0.7.0