manual merging in myerju's pull request