Merge pull request #69 from cassandra-project/develop

get updates
updates #291
fixes #299
Merge pull request #303 from fgiannar/develop

updates