Development alex

Merge development branch to master