Apply changes suggested in #15
Make i tag the default instead of span
Merge pull request #16 from suluke/master

Apply changes suggested in #15