Merge pull request #172 from bajamircea/master

Added check for already defined NOMINMAX