Merge branch 'issue_55' into issue_3