updates
Merge pull request #1 from dfarnsworth/master

updates