Refactored helpers
Merge branch 'master' of github.com:HeiaHeia/api-docs