Merge branch 'pr/47'