- removed whitespace
- made deciding on the content setter method a little cleaner
Merge branch 'master_embed_html'