Merge branch 'issue_56' into issue_3