Updated with fix for issue #21.