Updated
Merge pull request #66 from theodi/phil_edit

Updated