Merge pull request #116 from gwelymernans/master

Try not to break after the variable in a default initializer.
Merge remote-tracking branch 'upstream/master'