Merge pull request #178 from fgiannar/develop

Develop
Hotfixes for cons models and d-n-d
Merge pull request #42 from cassandra-project/develop

Develop