Merge pull request #151 from Socapex/osx

Minor OSX changes and 10.6 support in xcode project.