Develop

Fixed issues #62  and #63