Archive of the first attempt at fixing Issue #40. As this has been fixed by other means this branch is deprecated.
