Fix issue #7 - Respect PSR-1 & PSR-2