Merge pull request #53 from cassandra-project/develop

Develop
#152,  #149 Hotfixes & Additions
Merge pull request #253 from fgiannar/develop

Develop