Implemented an initial partial fix for issue #5
Implemented the first bit of the fix for issue #3