Merge pull request #15 from dgiovann/master

Notifications basically done
XML\!
merged?
Absorbing changes from Paul