Merge branch 'feature/fix-folding' into develop

Fix #2
Update credits