updates
Merge pull request #19 from codylindley/master

updates