tomchop Merge pull request #62 from CrimsonGlory/master