fixing #33 and updating #39