manually resolved diff with stock kusaba #44
Merge branches 'master' and 'iss44'