:+1: 

I hope @linsomniac can merge #34 and #35 soon.