Updates
Merge pull request #27 from theodi/Phil-edits

Updates