merge development branch

Thanks. That's way simpler.