Fixes #5 and optimized comment partial