Merge pull request #64 from cassandra-project/develop

get updates
implements #279
Merge pull request #280 from fgiannar/develop

implements #279