updated  stuff
Merge pull request #3 from ImmyR/master

updated  stuff