Fixes #5
Merge origin/1.0-branch into 1.0-branch