Merge pull request #2 from luciansmith/master

Revamped CMake; suppressed warnings; bug fixes
Merge pull request #1 from stanley-gu/master

Merge pull request #2 from luciansmith/master