changed some values
Fixed merge conflict
Merge pull request #23 from NarPar/master

did not big stuff