removed conflict
Merge pull request #22 from KodeIV/natsnewbranch

removed conflict