issue #35 resolved