Fix some bugs
Merge branch 'develop' of github.com:yihsiaol/real_time_app into develop