Approved Patch from bcarlin (see #111)

Approved Patch from bcarlin (see #111)