New master 

First try to solve problem with incorrect commit order