Hotfix 0.7.1

Commits for version 0.7.1