updated some things
Merge pull request #1 from Timcolpit/Tim

updated some things