APP-6
Merge pull request #2 from VoIPGRID/master

APP-6