fixing the build, improving the arrays and structures in CBMC analyses
Merge remote-tracking branch 'origin/master'