fixed #47 fixed #56
minor change