Fix on albums with same names
fix unit tests and refactor method
Merge branch 'leizh-fix-albums-with-same-names'

Closes #191