Merge branch 'develop'
Merge branch 'develop' of https://github.com/danlin/danlin_modules
typo and disconnection bug