Merge pull request #162 from moaa/master

Travis-CI and Jasmine