Upgrade version
Correctly compute the number of containers needed.
Merge branch 'feature/v0.1' into develop