Merge pull request #1 from cinnamocha/master

Test