Fix everything
Merge branch 'master' of https://github.com/samdesrochers/LOG8430