updates
Merge pull request #1 from jordanbstarr/master

updates