Merge pull request #1 from geosky/master

rewrite some of class
Update cmake file.
Merge pull request #1 from htoooth/master

ht