Added DEBUG option