Merging Joohee's branch into Andres/Rolan branch

Merging Joohee's branch into Andres/Rolan branch