Merge pull request #1 from sokil/master

update