added debug printout
merge with master