Merge branch 'issue-135'