Refmodel merged to master