more edits
Merge pull request #40 from shawnlknight/shawnInfo

more edits