drmonkeyninja Merge pull request #39 from petecooper/patch-1