Fixes for standard compliance.
Added composer support