Fixed builds under unix
Merge pull request #1916 from Prototik/unix-build

Fixed builds under unix