Merge branch 'pr/12'
Merge branch 'master' into pr/12