#18 JSQLW-18 Source Formatting
Merge remote-tracking branch 'origin/master'