Updated include
 - Changed the extra char count functions to a reusable one
 - Added support for multiline comments