Merge branch 'pull-74'