Fixed travis config
Fixed unit tests
Merge pull request #12 from chillu/pulls/travis-fix

Pulls/travis fix