Updated, Refactored, PSR2
Merge branch 'development', for better compliance