Fixed issues #72 and #62

two more issues done