(feat) fix pending functions to work with the server
(feat) change && to if statement
(feat) delete spaces
Merge pull request #5 from Neco-Murphy/feat/pending

(feat) fix pending functions to work with the server