Fix for Windows build and making NEON target optional
Merge pull request #561 from dbabokin/neon_condition

Fix for Windows build and making NEON target optional