issue53 second commit

merge