Merge branch 'pr/18'