Merge pull request #21 from scottanderson/master

[FIXED JENKINS-17913] Expand manifest file and URL
Add --trace option