Fixes #54.
Merge pull request #55 from CUTR-at-USF/issue54

Fixes #54.