Main and polish
Merge pull request #2 from mewtwo15026/master

Main and polish