Use KVO in a context-aware fashion.
Merge pull request #23 from sixten/develop

Use KVO in a context-aware fashion.