updated self
Merge pull request #360 from scopatz/scopatz-update

updated scopatz