Update
Update
Update
Update
Update
Merge pull request #10 from sanemat/feature/travis-upd

Feature/travis upd