Merge branch 'master' into step-0
remove puts for debug
Merge branch 'step-0'