Fixes #3, fixed #1
Merge branch 'master' into 1.5.2