issue #11
Merge pull request #13 from indykish/master

Fix for issue #11