Merge pull request #32 from stevage/bug-4258-4259