improve string handling
Merge branch 'master' of https://github.com/sebpearce/firewood
add enum values