Merge pull request #30 from cassandra-project/develop

Develop
Beautification & Hotfixes

Issues  #130, #128, #127, #124. #123 and #76,  #102, #133
Merge pull request #134 from fgiannar/develop

Develop