Added auto-accept

Very messy commits (failed manual merge)
From your code - didn't want to touch it, figured it didn't harm anyone and you probably had your reasons