Fixed #43, should effectively work the same as before
Merge pull request #44 from Jameskmonger/master

Fixed #43, should effectively work the same as before