fixed issue #9.
working on issue #43.
Merge pull request #45 from ahebert/master

fixed issue #9.