pull changes from jehugaleahsa

attempting to update my fork