change handling of all format type
Merge branch 'master' of github.com:tadl/ilscatcher2