Fixes #129
Merge branch 'issue-129' into develop