Updated to match psr-2 spec, fixed header comments