fix typo
compile framework
merge develop