Merge pull request #12 from digitalfun/ext_ds

update develop
Merge pull request #13 from digitalfun/develop

Merge pull request #12 from digitalfun/ext_ds