fix issues encountered upgrading to WAMP 2.5
Merge pull request #178 from sbillard/master

fix issues encountered upgrading to WAMP 2.5