- Updated with fix for issue #1.