Add logging, update description in header
Resync
Add logging, update description in header
Merge