Made PSR-2 compliant.
Merge branch 'static-raw' into develop