Merge branch 'master' of https://github.com/wsjyz/imagetaker
Merge branch 'master' of https://github.com/wsjyz/imagetaker