remove else and c++11 warnings
Merge remote-tracking branch 'visenze/master'
Merge pull request #3 from magiczhao/master

code style modify