Update to latest driver code
Merge pull request #6 from JEBoothjr/master

Update to latest driver code