work in progress
Merge branch 'master' into issue-157
Closes #157