Fixes #57
Merge branch 'quick-fix' into develop