Implementation is finished #10
Merge pull request #14 from tAsktoys/CategorySelectionImplement

Implementation is finished #1