Merge pull request #68 from cassandra-project/develop

get updates
fixes #287
Merge pull request #289 from fgiannar/develop

fixes #287