Merge pull request #1 from tailormoon/master

update