fix general function bug
remove markdown
Merge branch 'master' into develop
update markdown
rebuild
Merge branch 'develop'