Merge pull request #47 from daven009/master

Updates
bug fix
trying watermark