Merge remote-tracking branch 'origin/master'
Fixes #16
Merge branch 'issue-16'