Add OSX and Windows compatibility
14 files changed