Make bridge compile again
Merge pull request #45 from marcel-blonk/develop

Make bridge compile again