Fixed Promise.Then()
Merge branch 'master' solving conflicts