added stuff
Merge pull request #3 from perrylot/branch-a

added stuff