stable merge

merge, seems to be stable at the moment