Merge branch 'pull-48'