Merge pull request #181 from fgiannar/develop

Develop
Hotfixes on libraries issues #148 and #149
Merge pull request #44 from cassandra-project/develop

Develop