yet another merge

...s request. Even though the functionality works fine, I cannot state I'm fine with the way it's been implemented. And they were always drinking all our coffee and messing around with the chairs in the office.