Merge pull request #11 from bigfatbrowncat/upstream-merge

The new libcore is patched for Windows and OS X