Merge pull request #1 from att/develop

updates