Bidswitch adx

Took the bitswitch commits from Jan's PR (40) and removed the PR related to ubuntu 14.04 migration