merge Martys mods and Rons mods
Merge pull request #135 from RonPasquarelli/master

merge Martys mods and Rons mods