Enhance support for Photoshop files
Fix broken command line utility