Fix some compiler warnings reported by Clang 3.4.0
Merge pull request #274 from zhang-jingwang/master

Fix some compiler warnings reported by Clang 3.4.0