jsturgill Merge pull request #1 from RReverser/patch-1