Merge request 

Not sure is this is the way to get my fork updated... Will probably never get how git works...