Pull Request for latest files to my fork

Updating my fork with latest version.