Merge branch 'pr/6'
Merge branch 'master' into pr/6