Updated/New Composer support for Numbers_Words

See diff for full changes