Merge pull request #54 from cassandra-project/develop

Develop
Merge pull request #259 from fgiannar/develop

Merge pull request #54 from cassandra-project/develop