continuing our journey for tokbox
Merge pull request #6 from FabioFleitas/shayan

continuing our journey for tokbox