Improved consuming, scalars still not properly handled on user key added/removed
Merge branch '0.5.0' of github.com:hers-belgrade/hersdata into 0.5.0