Merge pull request #21 from ZomgPonies/master

Merge from Master
Implant Fix
Merge pull request #442 from Fox-McCloud/Implant-Fix

Implant fix