Fixed bom issue for online mode
Merge branch 'master' of https://github.com/hanlonal/CSE4982013