Fixes #23 (hopefully)