Merge pull request #46 from RustyGearKing/master