monkey patch, todo: refactor
Merge branch 'master' of https://github.com/vise890/flickrpedia