FIXED MERGE F

sorry for the repo rename, I hope this didn't break anything on your
end. This commit finally puts my changes into the repo with yours.