Fixes #14 (Thank you @tristanseifert)