Merging Europia79's changes