Fix #137
Use full years!
Remove redundant line
Add followup method, fix #134