updates
Merge pull request #6 from codylindley/master

updates