Changes on the use of cassandra driver to avoid duplication
Merge remote-tracking branch 'origin/master'