updates
Merge pull request #3 from Databates/Dan

updates