Merge pull request #4 from Wei-1/master

[MARVIN-23] Website Content Generation Fix