close #133 and moves forward for #140