Fix + comments
Merge branch 'master' of https://github.com/Arkonzoa/gti310-4.git