thexmanxyz Merge pull request #13 from jawn/patch-1