Merge pull request #255 from krakjoe/master

safety for values
correction