langphil Merge pull request #19 from theodi/phil-updates-2 …