Merge branch 'github/pr/57'