Update
Update
Update
Update
Merge pull request #9 from sanemat/feature/travis-update

Feature/travis update