Merge pull request #1 from chrisfinazzo/master

Sync
Merge pull request #2 from chrisfinazzo/fix-the-footnotes

Merge pull request #1 from chrisfinazzo/master