FORK: A few not-yet-merged fixes. Use the PRECOMPILED branch - View it on GitHub