Better docs
Replaced potentially harmful SimpleDateFormatter with JodaTime. SDF is not thread safe...
merge