fixed issue 11
Merge pull request #24 from dreback/master

fixed issue #11