Feature/4

this has #5 already merged as it was useful to have it while developing #4.