Issue #364 fix and issue #152 partial fix#365

pearcej merged 1 commit intopearcej:mainpearcej/opensource:mainfrom

logananglin98:issue#364fixattempt1logananglin98/opensource:issue#364fixattempt1Copy head branch name to clipboard