Added more debugging statements.
Merge origin/master