V0.95 html modified; Bugfixes
Merge branch 'entw'