Merge pull request #18 from ParadiseSS13/master

Merge from Master
Fixes-Tweakes
Merge pull request #72 from Fox-McCloud/Fixes-and-Balance

Fixes and balance