Merge pull request #2 from xrchz/master

whitespace tweaks
inserted error messages

put in error/success messages, changed make_filename() so that it
returns a string