Fix build issue under macosx
Merge pull request #282 from Chilledheart/develop

Fix build issue under macosx