Updates
Merge pull request #30 from iceraj/develop

Updates
Update html
Fix for netscape
Merge pull request #2 from iceraj/develop

Minor fixes
Merge pull request #31 from iceraj/master

Minor fixes
Merge pull request #32 from starteam/develop

Minor fixes