Updated viennacl-dev branch