minor edits
Merge pull request #66 from marsmith/master

minor edits
resolved conflicts