fit
Merge https://github.com/shamsuvs/smashplus