Final final
Merge pull request #31 from theodi/Phil-edits

Final final