Merge branch 'issue_45' into issue_44