Merge branch 'patch-1' of github.com:GUIpsp/antigen into patch-1

Conflicts:
	.travis.yml