Merged new version to our fork