Merge pull request #3 from ApolloCoding/master

Merge main & dev
Merge pull request #4 from ApolloCoding/master

Who command fix
Merge pull request #6 from ApolloCoding/master

Merging both branches again ... Push to DEV, not MAIN
Nano UI fix
Merge branch 'dev' of https://github.com/ApolloCoding/Apollo-Coding into dev
Merge pull request #7 from ApolloCoding/dev

Dev