catalogue (almost) fixed
Merge pull request #61 from pisi79/master

catalogue (almost) fixed