ReturnData: template format added
Merge branch 'master' of github.com:aabweber/misc