Merging forks

Seeing if I am able to merge the fork by eggdropsoap into the main repo