Merge pull request #1 from moztn/master

reverse
second hack
Merge pull request #2 from Chaasof/test_b2

Test b2