Improved uniqueness check
Merge branch 'master' of https://github.com/Setebos/Gallery