Fixes #3, fixes #22 - thanks @Kazo!