roll back
Merge pull request #36 from theodi/Phil-edits

roll back