Cleanup/Sync for resuming watermarking feature
Merge pull request #2 from MEICS/feature/cleanup-sync

Cleanup/Sync for resuming watermarking feature