Resolves #15
Merge branch 'bugfix-#15' into develop