updating my fork from the dmelcher original

If anyone else receives this, please delete.