More capacity
Merge branch 'issue-56' into issue-46