#46 - merging