for #32 - test suite & bug fix & refactoring
Merge branch 'master' of github.com:clarat-org/clarat