Merge pull request #605 from caktus/develop

v0.7.3
Merge branch 'develop'