Many improvements on #35.