Merge branch 'issue_70' into production