Merge pull request #48 from eskim/work_item_enhancement

work item enhancement (DO NOT MERGE)