Merge pull request #40 from cassandra-project/develop

Develop
Issue #19
Merge pull request #176 from fgiannar/develop

Develop