Merge branch 'bug181'