Merge pull request #54 from cassandra-project/develop

Develop