Fix substitution
Missing parts from rip_block
Merge branch 'master' of github.com:nchong/emibench