Added Multi-line comment parsing
TODO: Add Javadoc