Added filename parsing options
Merge github.com:gubi/Ninuxoo-2.0
Added filename parsing options