Commited to fast, I didn't merge properly RSpliet's patch
Commited to fast, I didn't merge properly RSpliet's patch

karolherbst/envytools,hakzsam/envytools,envytools/envytools,karolherbst/envytools,MoochMcGee/envytools,karolherbst/envytools,pierremoreau/envytools,hakzsam/envytools,envytools/envytools,kfractal/envytools,karolherbst/envytools,envytools/envytools,kfractal/envytools,hakzsam/envytools,pierremoreau/envytools,kfractal/envytools,grate-driver/envytools,MoochMcGee/envytools,grate-driver/envytools,MoochMcGee/envytools,MoochMcGee/envytools,kfractal/envytools,envytools/envytools,pierremoreau/envytools,kfractal/envytools,envytools/envytools,pierremoreau/envytools,pierremoreau/envytools,grate-driver/envytools,hakzsam/envytools,grate-driver/envytools,MoochMcGee/envytools,hakzsam/envytools,grate-driver/envytools,karolherbst/envytools