Now can deal with whitespace and newlines
Merge remote-tracking branch 'origin/master'
Commented last end brace