Merge pull request #1 from 0k/master

update