#98 Other: Better testing with travis-ci
Merge remote-tracking branch 'origin/dev-v0.5-travis' into dev-v0.5-travis

* origin/dev-v0.5-travis:
  #98 Other: Better testing with travis-ci

Conflicts:
	.travis.yml