PHPCI/Store PSR2 compliance. Issue #18