#38
Not very smart but usable solution for #39
Added a quite smart solution for #40 ;)