Daddy's fixes
Merge pull request #54 from Ninja-Squad/fix-one-year

Daddy's fixes