Fixed issue #95 definitively