Fixed another /invite-bug
Merge branch 'master' into persnusk
Cleaned function names and update lists when exiting the program