Fix for issue #52
Merge pull request #59 from arthurakay/master

Fix for issue #52