Fix for issue #51

This should fix issue #151

I'm really having issues with the github UI atm. Sorry if I mess up this request.