updates
Merge pull request #11 from codylindley/master

updates