updates
Merge pull request #16 from calebbradley/master

updates