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

bug fixes