bug fixes
Merge branch 'master' of https://github.com/DiJei/MAC300
ssrow e bugfixes finais