Fixed some dumb mistakes
Merge branches 'master' and 'master' of https://github.com/QuasimodoNZ/Bluno-WaiNZ