Fixes #22 :D