Fix for issue #17
Merge pull request #19 from POSSA/working

Fix for issue #17