Some fixes
Merged changes
Merge branch 'master' of https://github.com/hayatoshimizuBSKYB/chef-cassandra.git