Develop

Hey Marc. 
This is merge if you could put that on top of yours : ) 
Either as a patch or just merge this one.