Merge pull request #1 from Mobicents/master

Pull upstream changes