Merge pull request #5 from marcovala/master

[CLEANUP] - Refactored executeEndpoint