merge
Moved debugging tools into external module
removed macros