Removed .travis file
Merge remote-tracking branch 'origin/master'
Fixed unit tests