Add footnote support
Resolve merge conflict
Merge pull request #34 from jhoepken/master

Add footnote support