refs #94
closes #85 & upgrade to latest driver
Merge branch 'issue-89' into release
merge from issue-94