fix
Merge branch 'test' of github.com:Traf333/watermarker into test