Merge pull request #95 from cassandra-project/develop

get updates
Closes #421
Merge pull request #423 from fgiannar/develop

Closes #421