merging latest changes into my fork