Mergind dev to master as it is stable enough

It's time