all the changes
Merge pull request #125 from JasonBenn/updates

all the changes