增加两个新功能
Merge branch 'develop' of github.com:markleung1969/future-con into develop