Merge pull request #1 from uBLAS/master

Test pull request
Merge branch 'master' into ublas_develop