Fix for issue #116.
Merge pull request #124 from austindavies/fix-116

Fix for issue #116