Reflect RC1 html changes
Compatible with older than RC1.0
Cleanup
Merge pull request #222 from Gomez/master

Reflect RC1 html changes