fixed issue 8
Merge pull request #14 from dreback/master

Fixed issue #8