Added support for <object>
Fix comment style
Merge pull request #4 from pabloz-globant/master

Added support for <object>