#146 refactored bundled driver support
Merge remote-tracking branch 'origin/master'