Added NDEBUG macros around debug output