more fix
Merge branch 'develop' of https://github.com/tna20141/CEDS into develop