Fixes #23
Merge pull request #28 from aearturo/workitem_23

Fixes #23
Merge branch 'master'