Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
All this needs to be tested, but here :P
Merge pull request #473 from alexbegt/master

It would need to be tested prog :P