update to jpeg
Merge pull request #24 from ottomao/master

Auto merge by kpm server