Update forked branch

The intent of this pull request is to update my old files with the most current from the master.