Refactored to JodaTime 2.2