Prevent other elements getting stripped out of conditional comments
updating tests
Merge pull request #24 from yargalot/development

Development