added helper class
Merge branch 'tbarker'