Issue #33 - multiple DS support
Merge pull request #65 from quintonm/master

Issue #33 - multiple DS support