Fixing issue in the driver
Merge branch 'master' of https://github.com/tcasper/cmix