APP-51
APP-16
Merge pull request #4 from VoIPGRID/master

Merge