Updating kevininspace fork from upstream