Fix Mac OS X compilation issue
Merge pull request #28 from changlan/master

Fix Mac OS X compilation issue