v0.4 Added: removing comments