Changed D2S array type
Fixes #22