Few changes in order of operations.
Merge branch 'master' of https://github.com/D3Up/API