Issue57

issue #57 updated