some improvements
Merge pull request #1622 from conejoninja/catname

some improvements