Simplified the code and bundled the Linux and OS X libraries