Adding temp debug code for #89
Merge remote-tracking branch 'origin/master' into dev