Merge pull request #176 from fgiannar/develop

Develop
Merge pull request #177 from fgiannar/develop

Bug fixes
Hotfix
Merge pull request #41 from cassandra-project/develop

Develop