Merge branch 'feature/updated_ci_matrix' into develop
travis-ci is a piece of crap
Merge pull request #2 from andriytyurnikov/master

i have travis ci