added more stuff
try again
Merge pull request #1 from ewbutterfield/eric-branch

Eric branch