updates
Merge pull request #32 from willtsay/tommy

updates