Added preferences option for drive type
Merge branch 'devel'