Fixes #56
Merge branch 'origin/master'