Issue #46 resolved