Merge branch 'issue-29'