#253. Additional commit, improved year validating