Merge pull request #14 from digitalfun/ext_ds

merge changes from ext_ds