Fix issue #11
Merge pull request #13 from kdelemme/issue11

Fix issue #11