Changed the set of observers to a list of observers
Merge branch 'observers' into master-fixed