more changes
Merge pull request #1 from AkermanGreg/tommy

more changes