Final updates
Merge pull request #29 from theodi/Phil-edits

Final updates