No longer have to escape $setup_constants & $initialise_machine with another $
Fixed logger
Merge remote-tracking branch 'origin/develop' into develop