fix #125
Merge branch 'release0.2' of https://github.com/wukong-m2m/wukong-darjeeling into release0.2