Fixes #45. Aaaah, that feels better!