Reduced the scope of today and tomorrow variables
Merge branch 'master' into working
Restructured FlexiCommandParser as preprocessor.
Merge pull request #52 from andhieka/working

Restructured FlexiCommandParser as preprocessor