Merge 0.3.5 and update regex to not require spaces before end of comment