Merge branch 'hotfix/0.2.1'
Merge pull request #6 from vbergae/develop

Merge branch 'hotfix/0.2.1' into develop
Merge pull request #7 from vbergae/develop

Develop
Update .travis.yml
Update .travis.yml
Merge branch 'master' into develop

* master:
  Update .travis.yml
  Update .travis.yml

Conflicts:
	.travis.yml

Fixes:
  Build error