Added two-step unfolding
Merge branch 'master' of https://github.com/rappoccio/usercode