Issue #47 resolved