More improvements on #35.