updates
Merge pull request #9 from mikey179/master

updates