Merge pull request #3 from jerryrt/master

Mac Port related (with Chameleon) changes