fixed #354
fixed #352
Merge pull request #356 from htlxyz/hotfix/samples_browser_improve

fixed #354,fixed #352