added debug logging
Merge remote-tracking branch 'naomi/master'