Merge pull request #2 from bbai/master

Master
Merge pull request #3 from bbai/AllConfig

Merge pull request #2 from bbai/master