Merge changes

+ Tests