Develop

Merge changes from ublas.