Merge branch 'issue_57' into issue_3