Update from ryanvarley's repo.