added setYearMaster
rebase master