Merge branch 'master' of github.com:pashazel/scroll
added convertion options for clients images
Merge pull request #13 from hkjx/master

 	added convertion options for clients images