Fixed an issue with "+" in the filename, issue #13

A fix for issue #13, where the problem with a filename containing a "+" character is described and a solution posted by @petrofm implemented, including a test.