Incremented version. Modified header guards.