Merge pull request #379 from jlj/master

Xcode build improvements