catalogue (almost) fixed
Merge remote-tracking branch 'upstream/master'
vai su
Merge pull request #62 from pisi79/master

test