Merge pull request #48 from cassandra-project/develop

Develop
Merge pull request #49 from cassandra-project/develop

Develop
close #221, Issue #223
Merge pull request #224 from fgiannar/develop

Develop