Use initializer lists
Merge remote-tracking branch 'patrick/patch-1'