Addressing issue #32

Please test this out, as I don't have the test data to check.