Merge branch 'new-engine' into develop
added debug option in makefile
fix issue 24