Fix suggested by @ansel1 to add Mac OS support to the library
Added additional pre-compile conditions
Merge branch 'master' into macos-adapation
Merge branch 'macos-adapation' into 043013-candidate
adding MacOS support to demos