Quick change that fixes #8
Merge branch 'develop'