lots of updates
Merge pull request #1 from tgbrandon/master

lots of updates