fix
fix
Run counter inv. full. Need test.
One week done.
Merge branch 'iss5' into iss1