Some improvements
Merge branch 'master' of https://github.com/nerdy-works/Geagle