Update credits
Merge branch 'feature/add-memory-limit' into develop