Merge branch 'issue_19'