Improved usage of promises
Merge pull request #16 from MorleyDev/develop

Improved usage of promises