PHP-CS-Fixer for Travis
Merge branch 'pr/19' into develop

Closes #19.

Conflicts:
	composer.json