Closes #133
Merge branch 'bugfix-#133' into develop