Development

Last updates form development branch