Use cmd instead of entrypoint in order to make life easier for fig users
Merge branch 'develop'