updates
Merge pull request #12 from codylindley/master

updates