lots of additions
Merge pull request #37 from shawnlknight/shawnInfo

lots of additions