Fixed issue with iswindows() function call
Merge branch 'develop'

* develop:
  Fixed issue with iswindows() function call