Updating with other pull requests to be able to merge yours

I know it's been a while, but if you're still interested, please merge this request so that we may merge your request on the ServerGrove fork