#25 - more date functions, removed JodaTime dependency