Merged code from ATT Dev Summit
Merge pull request #1 from tomhambleton/master

Merged code from ATT Dev Summit