Added Klobys
Merge with master
Update html