closing issues #66 and #62