Fixing bad cigar strings
Merge branch 'dev' into fastmiso