observer and dependency refactoring
observer and dependency refactoring
Merge remote-tracking branch 'origin/master'