Merge pull request #12 from uBLAS/develop

Develop