Merged changes, updated documentation, minor version bump.