Refreshed fork

Replaced old fork with a new one, and replaced old files with my current ones.