Fixes #12
Merge branch 'master' into bug-12