Merge pull request #271 from Monika0000/master

fix re-defines