Merge JonatanBranch and master