Merge pull request #35 from ParadiseSS13/master

Merge from Master
Stun Changes
Merge pull request #122 from Fox-McCloud/Stun-Changes

Stun changes