Issue #13 fixed.