Fixes #270.
Merge pull request #276 from jfarid27/fix-issue-270

Fixes #270.