Issue #14 seem fixed