re fix bugs
Merge pull request #40 from roselone/master

picture web