Fixes #141
Merge branch 'develop' of https://github.com/wukong-m2m/wukong-darjeeling into develop