first round edits
Merge pull request #2 from uhlenhuthm/master

first round edits