Merge branch 'alpha' into dev

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Edit the logging and debug output mechanism

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>
Merge branch 'dev' into alpha

Signed-off-by: Philip Luyckx <philip.luyckx@gmail.com>