remove simplefold, add ruby block
Merge branch 'master' into ubuntu