Merge pull request #45 from aviks/master

Quick fix to failing tests
Faster parser integrated with mainline. Remove old perf test. Fix #46