Issue #161 resolved