Merge pull request #12 from ctso/master

Fix for 'category' and 'label' directives.
bumped version