Pull request 

Able to marge, 2 commits, tast