now, we have multistep :D
fix conflict
Merge pull request #5 from jarodriguez/master

now, we have multistep :D