Merge pull request #350 from raboof/avoid-innerHTML

Avoid 'innerHTML'