Please merge

Please check code