Changes for mac-compatibility
Merge pull request #19 from xiongying0007/mac-compatible

Changes for mac-compatibility