Changes value array key

Fixes issues #14 and #15 of master branch