fix cassandra 2.1 compatibility
Merge pull request #1076 from stuartf/issue-1076

Compatibility with Cassandra 2.1