This looks good to me!
Thanks, rebasing and merging :)
rebased
Pull-Request has been merged by pingou