Tale of Two Cities Update
More fixes by Flaminsarge
Removed HTML header junk
Merge pull request #4 from TheKins/master

Update fork with upstream commits