Solves #18
Merge branch 'bugfix-#18' into develop