Issues #179 and #180
Merge branch 'issue180' into develop
Merge pull request #43 from cassandra-project/develop

Develop