Rev 1 code
Merge pull request #1 from brennentsmith/master

Rev 1 code