Merge pull request #13 from praccu/master

Updating
Categories and Tags now show a message if there are none to display.
Merge pull request #27 from kostya-viktorov/master

Updating