Patch 1

merged upstream