Merge branch 'release-0.1.9'
bugfix to last commit missing @ in @else
Version bumped from 0.1.9 to 0.1.10
Merge branch 'release-0.1.10'