Merge pull request #1 from mborne/master

Merge bench, clean files, pointers for shells