Notifications and ContextPreferences
Merge pull request #174 from cortiz/master

Notifications and ContextPreferences