more edits
Merge pull request #43 from shawnlknight/shawnInfo

more edits