minor bug fixes
Merge branch 'master' of github.com:zealotjin/learn
fix some cucumber tests
Merge branch 'master' of github.com:zealotjin/learn