fix wercker
Merge branch 'master' into step-1
Merge branch 'step-1' into step-2