Fixed cmake and Travis
Merge pull request #31 from nurupo/master

Fixed cmake and Travis