Merge pull request #2 from MeowInnovation/master

Merge version