add latest changes from pelican