first round of code
Merge pull request #1 from thoughtfulbloke/master

first round of code