Merge branch 'issue-11'