Version 2.1

Semester/year bug fixed