Merge pull request #1 from toyes/master

manifest
Merge pull request #2 from toyes/jb-mr1

Merge pull request #1 from toyes/master