Merge of beauof coupling branch for pull request #179