Updating organization, philosophy, and version information.
Resolving merge.