Began working on proper year constraints
Fixed Issues #8 and #9
Merge pull request #17 from purpleplatypus/issue_9-8

Issue 9 8