Initial commit for Issue #319