Corrections made per comments on PR #37
Date now uses the Moment library