Merge branch 'issue-57' into minor