Merge #42 manually