fixed issue #9.
working on issue #43.