Merge pull request #3 from RaoZiJian/master

Fix Mac version bugs and restructure the Xcode project.