Applied the remark of Mr. paulmaxwell

PULL it into MASTER