fix compile error by xcode
Merge branch 'refactoring' into myrefactoring