Merge pull request #2 from CNBorn/upstream

completely remove header.html dependency & bugfixes.