Added multiple semester handling
Added comments