Merge pull request #1 from AlanMarshall/master

Makefile.am fix
Fully implemented the DataObserverAdapter
Simplified DataObserverAdapter by using expansion methods and a proxy