Merge pull request #104 from pszilagyi/master

BENCH syntax support and tests for various minor bugs and changes