Merge pull request #5 from armen/travis-ci

Travis ci