fixes #16
Merge branch 'pr/16'