Cdata issues

Fixes issues:
https://github.com/choreos/choreos_v-v/issues/3
https://github.com/choreos/choreos_v-v/issues/4