fixed mini bugs
Merge branch 'develop' of https://github.com/Adgek/CrazyMels into develop