Merge pull request #10 from massix/master

Fix issues in CMakeLists.txt + Refactor + Correct compiling warnings