Added more integration tests and added a hack to deal with spaces in files
Merge pull request #6 from basvodde/master

Integration tests plus space hack