bug fixes
disable bridgeit
Merge pull request #46 from Yaliang/master

Master