added flag check
Merge branch 'master' of https://github.com/surette/softwaredev
Merge branch 'master' of https://github.com/surette/softwaredev
fixes for filename handling in conversion
Merge branch 'master' of https://github.com/surette/softwaredev