More template work for datasets
Merge remote-tracking branch 'upstream/master'
Merge pull request #25 from thriuin/master

Some more template work on datasets