init
Merge branch 'devel' into stable
Merge branch 'devel' into stable
read charges correction

change the way the charges are read
Merge branch 'stable' into devel