closes #320
Merge pull request #72 from cassandra-project/develop

get updates
updates #316
Merge pull request #324 from fgiannar/develop

updates #316, #320