Merge pull request #2 from nonocast/master

update nonocast change
Merge pull request #8 from CanMusic/master

Merge pull request #2 from nonocast/master