#6 implemented and tested

let's merge