Improve name-getting
Merge branch 'master' of github.com:filiph/HYG-Database