Comments and whitespaces (fixes #16)