Added function getHtml to generate the html code for the object
Merge origin/master