Cleanup and fix for spaces in path names.
Merge pull request #3 from salamanderrake/cleanup

Fix for spaces in path.