Some performance tests for expression parsing
Fixes #27
Merge origin/master