Merge manateeworks with native plugin