Merge branch 'pull-request-56'