Merged back changes from upstream
fixed another spelling mistake