merging
merge
deployed travis and fixed the tests
Merge pull request #30 from eugenefilimonov/eugenes_branch

Eugenes branch