Done with #67, I hope.
Merge branch 'issue-67' into develop