Merge pull request #38 from fiddler-crabs-2014/master

Closing a duplicate merge
Merge pull request #39 from fiddler-crabs-2014/2ambeattheservers

Merge pull request #38 from fiddler-crabs-2014/master