Add stuff
Merge remote-tracking branch 'upstream-gnufied/master'