code refactored (no semantical changes intended)
Merge branch 'master' of https://github.com/Metalcon/reconciling