Merge pull request #1 from shallker/master

update