Merge branch 'pull-request/7'