Merge pull request #32 from manolo/master
Merge pull request #33 from manolo/master

Fix data method when passing a class