Merge pull request #183 from setrofim/master

shuilt: re-introduce speedup