Merge pull request #66 from fsb4000/STUN