Fixes #19 (I hope)
Merge origin/1.0-branch into 1.0-branch