Resolve #14. Bump upper version bound of base to 5
Solved conflict