Merge pull request #35 from gdetrez/master

Fixes bug #32
bar
Apply patch
Merge pull request #36 from gdetrez/33-datakinds

Fix #33 Take advantage of DataKinds