Print error message on SQL error; start filling in file handling
Merge remote-tracking branch 'origin/master'