Merge Development, so helped you Master!

Dunno how did the _The Big Lebowski_ video land here, but I removed it as it was not related. And this is the lamest pull message ever.