updates
Merge pull request #5 from codylindley/master

updates