Features/cassandra 2.0.5