working copy
Merge pull request #4 from slnz/#2-dataserve-trn

working copy