Merge pull request #1 from andresmoschini/prepare-base-site

Prepare base site