stupid dsstore
fixed merge  conflict
Merge pull request #3 from jnbaker/master

fixed merge conflict