I added some stuff

Description of what I did.
Merge pull request #2 from Kjdoering/master

I added some stuff