Merge branch 'master' of https://github.com/moki9/flickrize

Author:    moki9 <ltanalas@gmail.com>
Merge branch 'master' of https://github.com/moki9/flickrize