Merge pull request #1 from pepe2k/master

update