Merge pull request #52 from andhieka/working

Restructured FlexiCommandParser as preprocessor
Refactored getCategory wrt null value handling
Merge branch 'master' into working