first complete
add jpg image support, improve layout
Merge pull request #2 from oa414/master

add jpg image support, improve layout