big refactoring to prepare #4, introduction of automatic stage monitoring fixes #10
Merge branch 'feature_10'

* feature_10:
  big refactoring to prepare #4, introduction of automatic stage monitoring fixes #10