Merge pull request #4 from dimazest/pelican

Leftovers