3.0.0 Updates
Merge pull request #42 from SpiderLabs/master

Send 3.0.0 Updates to Trunk