removed debug output
Fixed cleaning up filenames.
Merge branch 'develop'