Fix dependencies
Mathematical expressions in rate definitions
Rate mathematical expressions
Merge branch 'cli' into dev