Merging master with dev. I get the things from master