Fixes #36
Merge branch 'master'