This should fix segfault and remove one-line comments
Merge pull request #91 from mannol1/master

This should fix segfault and remove one-line comments