Merge branch 'develop' of https://github.com/Nightink/node-Pophoto
Merge develop