fixing merge conflict
Merge pull request #15 from xxSandiLLyxx/mergeconflictremaining

fixing merge conflict