Merge branch 'bug_76' into production