Merged patch from gvarsami for BZ 1033196
Merge pull request #123 from EricWittmann/BZ-1033196-patch

Merged patch from gvarsami for BZ 1033196