Merge pull request #1 from nonocast/master

update nonocast change