Merge pull request #75 from xzero/osx-port

Mac OSX port
Merge branch 'master' of github.com:xzero/x0
Merge branch 'master' into osx-port