CSHM: Avoid data corruption (fixes #21)

Remove Configuration arg
Merge branch 'turenar/iss21'