Merge pull request #1 from pkp/master

update