adding more unfolding checks
mergeMerge branch 'master' of https://github.com/rappoccio/usercode