Add debugging cout statements.
Remove debugging output
Merge branch 'integration' into devel