fix show/hide on bugs
Merge branch 'master' into dev