Fix merge error
Merge branch 'develop' of https://github.com/golvmopp/BGSEP into develop