deal with loose promises
Merge branch 'feature/issue-27-v2-metrics-usage' into feature/issue-29-v2-metrics-analytics