#41 fixed a  minor bug
#41 clean up fix