fix errors
Merge branch 'master' of https://github.com/Eggy-Team/Eggy