Merging diana-new branch with master