Updated: Various formatting fixes
Updated: Dependency