Also need to change name, same for Bridge
Merge pull request #85 from xschildw/release-1.16

Also need to change name, same for Bridge