issue #32 fixed existing bugs from the feature