merging pull #236