Code adapted for 2.3 release
Merge pull request #11 from opentok/develop

2.3 release