Merge pull request #2 from qbaty/master

update