updates
Merge pull request #25 from JackDougherty/master

updates