minor cleanup
Merge remote-tracking branch 'origin/master'
new bug correction in suffix check