brian's edits
Merge pull request #37 from jlcohoon/master

brian's edits