add removeObserver before addObserver
Merge branch 'dev'