Merge pull request #14 from thriuin/master

Some template work on datasets 
More template work for datasets
Merge remote-tracking branch 'upstream/master'