fixed bugs
Merge branch 'master' of https://github.com/lanfeust129/Stremacup