changed some stuff
Merge pull request #3 from matt3/branch2

changed some stuff