#52, #42, #25 Finished for categories. 

Signed-off-by: Mr.FrAnTA <michal.dekany@seznam.cz>