Merge pull request #810 from narfbg/develop-driver

Clean up the Driver library