Closes #104. Replacing dates to joda