rebased
Code looks good and unittests pass locally F23
Thanks :)
Pull-Request has been merged by pingou