Fixes #30
New version