added some stuff
Merge pull request #1 from amsheehan/master

added some stuff