less debugging, smarter key addition
Merge branch '0.4.0' of github.com:hers-belgrade/hersdata into 0.4.0