add function watermark
Merge branch 'master' of https://github.com/junsongd/myproject