Another part of Issue #27
Merge pull request #29 from seandenigris/patch-3

Another part of Issue #27