Bug fix #32, also unit tests around this feature in base-driver
Merge pull request #33 from godaddy/bugfix-32

Bug fix #32, also unit tests around this feature in base-driver