Merge remote-tracking branch 'origin/3-gia-twice'
Merge branch 'master' of https://github.com/thebelin/gia-api-render-plus