fix rules
fix rules
Merge sangkil/master

Conflicts:
	composer.json