Fixed errors
Merge pull request #33 from willtsay/tommy

Fixed errors