Issue #15 seems to be fixed