Adding better (?) HTML extract by Apache Tika
Merged branch