Merge pull request #11 from NeoRaider/fixes