Improvements
Merge branch 'master' of https://github.com/Traxmaxx/5A002