Merge pull request #20 from ZomgPonies/master

Merge from Master
R&D Nerfs
Merge pull request #440 from Fox-McCloud/R&D-Nerfs

R&d nerfs