Handle C-style comments better, fix style warnings#13

rudi wants to merge 1 commit into

QBobWatson:masterQBobWatson/poporg:masterfrom

rudi:cleanupsrudi/poporg:cleanupsCopy head branch name to clipboard