Fix for issue #4
Merge pull request #11 from POSSA/working

Fix for issue #4