close #44


Imporvemnt #41 still needs more work