Added debug option
merge commit