Issue #24 - fixed double tag