manually merged pull request from isaacdontjelindell