Initial commit
Merge branch 'master' of https://github.com/doctanner/testing
Updated code.