simple observer
Merge branch 'feature/observer' into develop