Merge branch 'hotfix/#7'
messed up equality sign... doh!
Merge branch 'hotfix/#7.2' into develop