bug fixes aip and cvm
Merge branch 'master' of github.com:jopela/HairyEMV