Update manifest
Merge branch 'master' into update-manifest
Update manifest
Merge pull request #271 from aesedepece/update-manifest

Update manifest