0.5.1 - Fixes #12 (also adds a test for it)