Fixed issue with spaces in filenames and added tests
Merge branch 'filename_fix'

Fixed filename space issue and prepared tests
Merge pull request #100 from gazazello/master

Fix for issue with spaces in file names