Fixes #52
Merge branch 'master' into latests