Made everything compatible with viennacl-dev's master