minor bug fixes
minor bug fixes
merge of upstream
merge of upstream