Fix #1, and add test for it
Merge remote-tracking branch 'origin/master'