Fixes the makefile test execution
Adds escape key as a method of closing the window
Merge branch 'feature/MRSPACMAN-9' into develop