Grabbing changes from dieterdemeyer's master