Better following, but still onNewKey and onKeyRemoved should be reconsidered
Merge branch '0.4.0' of github.com:hers-belgrade/hersdata into 0.4.0