Using setter and getter for key and value now.
Merge branch 'master' of https://github.com/mgledi/DRUMS