added option to skip comments