fix Issue #1
Merge branch 'develop' of github.com:gingkoginkgo/newone into develop