Merge pull request #9 from hotemup/master

Upload merge